Skip to content

Report changes in simpleCSE (copy #1848)#1850

Merged
alex-mckenna merged 1 commit into
1.4from
mergify/copy/1.4/pr-1848
Jun 11, 2021
Merged

Report changes in simpleCSE (copy #1848)#1850
alex-mckenna merged 1 commit into
1.4from
mergify/copy/1.4/pr-1848

Conversation

@mergify

@mergify mergify Bot commented Jun 11, 2021

Copy link
Copy Markdown
Contributor

This is an automatic copy of pull request #1848 done by Mergify.
Cherry-pick of e7d7a47 has failed:

On branch mergify/copy/1.4/pr-1848
Your branch is up to date with 'origin/1.4'.

You are currently cherry-picking commit e7d7a47a.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   clash-lib/src/Clash/Normalize/Transformations/Letrec.hs

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

@mergify mergify Bot added the conflicts label Jun 11, 2021
The simpleCSE transformation previously never reported when it had
changed the resulting AST. With the fix from f68204f this meant
that CSE would often cause failures when using DebugApplied or
higher.
@alex-mckenna alex-mckenna force-pushed the mergify/copy/1.4/pr-1848 branch from 71a3daa to a01e7c5 Compare June 11, 2021 12:59
@alex-mckenna alex-mckenna enabled auto-merge (rebase) June 11, 2021 13:00
@alex-mckenna alex-mckenna merged commit 99f0e18 into 1.4 Jun 11, 2021
@alex-mckenna alex-mckenna deleted the mergify/copy/1.4/pr-1848 branch June 11, 2021 14:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant